From: Jasper St. Pierre Date: Wed, 5 Sep 2012 19:23:54 +0000 (-0300) Subject: lookingGlass: Fix object inspector for multi-monitor scenarios X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5851 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0d62ec5b0304f5d279ee56a723481a2c98cb845a;p=gnome-shell.git lookingGlass: Fix object inspector for multi-monitor scenarios Otherwise the object inspector appears off-screen. https://bugzilla.gnome.org/show_bug.cgi?id=683982 --- diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js index 3173e0d17..3c3d094af 100644 --- a/js/ui/lookingGlass.js +++ b/js/ui/lookingGlass.js @@ -371,7 +371,8 @@ const ObjInspector = new Lang.Class({ this._parentList = []; - this.actor = new St.ScrollView({ x_fill: true, y_fill: true }); + this.actor = new St.ScrollView({ pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }), + x_fill: true, y_fill: true }); this.actor.get_hscroll_bar().hide(); this._container = new St.BoxLayout({ name: 'LookingGlassPropertyInspector', style_class: 'lg-dialog', @@ -443,10 +444,6 @@ const ObjInspector = new Lang.Class({ this.actor.show(); if (sourceActor) { this.actor.set_scale(0, 0); - let [sourceX, sourceY] = sourceActor.get_transformed_position(); - let [sourceWidth, sourceHeight] = sourceActor.get_transformed_size(); - this.actor.move_anchor_point(Math.floor(sourceX + sourceWidth / 2), - Math.floor(sourceY + sourceHeight / 2)); Tweener.addTween(this.actor, { scale_x: 1, scale_y: 1, transition: 'easeOutQuad', time: 0.2 }); @@ -1092,8 +1089,8 @@ const LookingGlass = new Lang.Class({ this.actor.width = myWidth; this.actor.height = myHeight; this._objInspector.actor.set_size(Math.floor(myWidth * 0.8), Math.floor(myHeight * 0.8)); - this._objInspector.actor.set_position(this.actor.x + Math.floor(myWidth * 0.1), - this._targetY + Math.floor(myHeight * 0.1)); + this._objInspector.actor.set_position(primary.x + this.actor.x + Math.floor(myWidth * 0.1), + primary.y + this._targetY + Math.floor(myHeight * 0.1)); }, insertObject: function(obj) {